RESTRICT AUTOMERGE: Only applicable to mainline-prod Rebase to master@7159299 Change-Id: Ifbc7e122e3fa008741e306eca52cdb5ebd57d040 BUG: 178125045 Merged-In: Idae38e97145e5982e26d6852f22a190aabef4e28